bitkeeper revision 1.27 (3e4bc0aaYLPRPEot-3f6sspi3HC6Xg)

Merge with recent checkins

diff --cc .rootkeys
Simple merge

diff --cc xen-2.4.16/arch/i386/entry.S
Simple merge

diff --cc xen-2.4.16/arch/i386/setup.c
index 924d0ce2a174461a3729aa74e4733cbb442dffc0,57d3f93a7bd3196e06e7ce5cece6c27c1a57ff6d..e81f2da3ff5acf2cba5e4d0e4ef534ba14de7f99
--- 1/xen-2.4.16/arch/i386/setup.c
--- 2/xen-2.4.16/arch/i386/setup.c
+++ b/xen-2.4.16/arch/i386/setup.c
@@@ -280,9 -280,11 +280,12 @@@ void __init start_of_day(void
      extern void tqueue_bh(void);
      extern void immediate_bh(void);
      extern void init_timervecs(void);
 +      extern void ac_timer_init(void);
      extern int  setup_network_devices(void);
      extern void net_init(void);
+     extern void initialize_block_io(void);
+     extern void initialize_serial(void);
+     extern void initialize_keyboard(void);
  
      unsigned long low_mem_size;
      

diff --cc xen-2.4.16/include/asm-i386/apic.h
index 1f5670943b8322a074e1dfb223480298d4f3526f,166b68e0ffb8081232ce64b7635cb0276e2525f4..574cc232034b35c6b1136543a733dc74c6d34ac7
--- 1/xen-2.4.16/include/asm-i386/apic.h
--- 2/xen-2.4.16/include/asm-i386/apic.h
+++ b/xen-2.4.16/include/asm-i386/apic.h
@@@ -63,9 -74,26 +72,25 @@@ extern void sync_Arb_IDs (void)
  extern void init_bsp_APIC (void);
  extern void setup_local_APIC (void);
  extern void init_apic_mappings (void);
 -extern void smp_local_timer_interrupt (struct pt_regs * regs);
  extern void setup_APIC_clocks (void);
+ extern void setup_apic_nmi_watchdog (void);
+ extern inline void nmi_watchdog_tick (struct pt_regs * regs);
  extern int APIC_init_uniprocessor (void);
+ extern void disable_APIC_timer(void);
+ extern void enable_APIC_timer(void);
+ 
+ //extern struct pm_dev *apic_pm_register(pm_dev_t, unsigned long, pm_callback);
+ //extern void apic_pm_unregister(struct pm_dev*);
  
  extern unsigned int apic_timer_irqs [NR_CPUS];
+ extern int check_nmi_watchdog (void);
+ 
+ extern unsigned int nmi_watchdog;
+ #define NMI_NONE      0
+ #define NMI_IO_APIC   1
+ #define NMI_LOCAL_APIC        2
+ #define NMI_INVALID   3
+ 
+ #endif /* CONFIG_X86_LOCAL_APIC */
  
  #endif /* __ASM_APIC_H */

diff --cc xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
Simple merge

diff --cc xen-2.4.16/include/xeno/sched.h
Simple merge

diff --cc xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor.h
Simple merge